Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 14 Jul 2010 13:03:03 +0000 (13:03 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 14 Jul 2010 13:03:03 +0000 (13:03 +0000)

Trivial merge